From: Marko Mäkelä <marko.makela@mariadb.com>
Date: Wed, 12 Nov 2025 07:18:55 +0000 (+0200)
Subject: MDEV-35810 test log_file_size_online fixup
X-Git-Tag: archive/raspbian/1%11.8.5-4+rpi1^2^2~4
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=51f967044273f194820fd3b14528a832bc41d19a;p=mariadb.git

MDEV-35810 test log_file_size_online fixup

A KILL QUERY of SET GLOBAL innodb_log_file_size would sometimes lead to
ER_QUERY_INTERRUPTED being reported.

This also fixes MDEV-38287 that was visible on Launchpad.net ppc64el and
s390x builders.

Origin: https://github.com/MariaDB/server/commit/8794f8c3d7e1a7dd8e1e2f8c93298ff3f8dbef95

Gbp-Pq: Name MDEV-35810-test-log_file_size_online-fixup.patch
---

diff --git a/mysql-test/suite/innodb/t/log_file_size_online.test b/mysql-test/suite/innodb/t/log_file_size_online.test
index fb6722ee8..8ea5e662d 100644
--- a/mysql-test/suite/innodb/t/log_file_size_online.test
+++ b/mysql-test/suite/innodb/t/log_file_size_online.test
@@ -43,6 +43,7 @@ send SET GLOBAL innodb_log_file_size=7340032;
 let $ignore= `SELECT @id := $ID`;
 KILL QUERY @id;
 --connection con1
+--error 0,ER_QUERY_INTERRUPTED
 reap;
 
 --connection default